From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sun, 16 Aug 2015 09:53:39 +0000 (+0200)
Subject: Add patches for FTBFS with gcc5 (closes #795525)
X-Git-Tag: archive/raspbian/1.14.0+dfsg-2+rpi1^2~209
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=1111fb9b2f9868ecf5a0c97d7aecd3bef17a7f86;p=pcl.git

Add patches for FTBFS with gcc5 (closes #795525)

taken from upstream/master
---

diff --git a/debian/patches/0006-fixes-for-boost-1.56-and-Qt4.patch b/debian/patches/0006-fixes-for-boost-1.56-and-Qt4.patch
new file mode 100644
index 00000000..987f0b9c
--- /dev/null
+++ b/debian/patches/0006-fixes-for-boost-1.56-and-Qt4.patch
@@ -0,0 +1,112 @@
+From ccf9dab41c9f477b07d664f5a700c403d6737936 Mon Sep 17 00:00:00 2001
+From: Francisco Facioni <fran6co@gmail.com>
+Date: Wed, 1 Oct 2014 14:33:32 -0300
+Subject: [PATCH] fixes for boost 1.56 and Qt4
+
+---
+ apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp | 2 ++
+ common/include/pcl/common/boost.h                          | 2 ++
+ common/include/pcl/common/time.h                           | 2 ++
+ common/include/pcl/console/time.h                          | 2 ++
+ io/include/pcl/io/boost.h                                  | 2 ++
+ tools/boost.h                                              | 2 ++
+ visualization/include/pcl/visualization/boost.h            | 2 ++
+ visualization/tools/image_viewer.cpp                       | 2 ++
+ 8 files changed, 16 insertions(+)
+
+--- a/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
++++ b/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
+@@ -35,7 +35,9 @@
+ 
+ #pragma once
+ #include <boost/thread/thread.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/date_time/posix_time/posix_time.hpp>
++#endif
+ 
+ #include <pcl/apps/dominant_plane_segmentation.h>
+ #include <pcl/visualization/pcl_visualizer.h>
+--- a/common/include/pcl/common/boost.h
++++ b/common/include/pcl/common/boost.h
+@@ -48,7 +48,9 @@
+ #include <boost/shared_ptr.hpp>
+ #include <boost/make_shared.hpp>
+ #include <boost/mpl/size.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/date_time/posix_time/posix_time.hpp>
++#endif
+ #include <boost/function.hpp>
+ //#include <boost/timer.hpp>
+ #include <boost/thread.hpp>
+--- a/common/include/pcl/common/time.h
++++ b/common/include/pcl/common/time.h
+@@ -45,7 +45,9 @@
+ 
+ #include <cmath>
+ #include <string>
++#ifndef Q_MOC_RUN
+ #include <boost/date_time/posix_time/posix_time.hpp>
++#endif
+ 
+ /**
+   * \file pcl/common/time.h
+--- a/common/include/pcl/console/time.h
++++ b/common/include/pcl/console/time.h
+@@ -42,7 +42,9 @@
+ #pragma GCC system_header 
+ #endif
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/date_time/posix_time/posix_time.hpp>
++#endif
+ #include <pcl/console/print.h>
+ 
+ namespace pcl
+--- a/io/include/pcl/io/boost.h
++++ b/io/include/pcl/io/boost.h
+@@ -63,7 +63,9 @@
+ #include <boost/mpl/transform.hpp>
+ #include <boost/mpl/vector.hpp>
+ #include <boost/algorithm/string.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/date_time/posix_time/posix_time.hpp>
++#endif
+ #include <boost/chrono.hpp>
+ #include <boost/tokenizer.hpp>
+ #include <boost/foreach.hpp>
+--- a/tools/boost.h
++++ b/tools/boost.h
+@@ -52,7 +52,9 @@
+ #include <boost/lexical_cast.hpp>
+ #include <boost/make_shared.hpp>
+ #include <boost/date_time/gregorian/gregorian_types.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/date_time/posix_time/posix_time.hpp>
++#endif
+ #include <boost/date_time/posix_time/posix_time_types.hpp>
+ #include <boost/thread/thread.hpp>
+ //#include <boost/uuid/uuid.hpp>
+--- a/visualization/include/pcl/visualization/boost.h
++++ b/visualization/include/pcl/visualization/boost.h
+@@ -60,7 +60,9 @@
+ #include <boost/thread/mutex.hpp>
+ #include <boost/thread/thread.hpp>
+ #include <boost/foreach.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/date_time/posix_time/posix_time.hpp>
++#endif
+ #include <boost/filesystem.hpp>
+ #endif
+ 
+--- a/visualization/tools/image_viewer.cpp
++++ b/visualization/tools/image_viewer.cpp
+@@ -37,7 +37,9 @@
+  */
+ 
+ #include <boost/thread/thread.hpp>
++#ifndef Q_MOC_RUN
+ #include <boost/date_time/posix_time/posix_time.hpp>
++#endif
+ #include <pcl/point_cloud.h>
+ #include <pcl/point_types.h>
+ #include <pcl/common/time.h> //fps calculations
diff --git a/debian/patches/0007-Fix-for-boost-1.57.patch b/debian/patches/0007-Fix-for-boost-1.57.patch
new file mode 100644
index 00000000..7410497d
--- /dev/null
+++ b/debian/patches/0007-Fix-for-boost-1.57.patch
@@ -0,0 +1,172 @@
+From 1d48a7588658b1c33860d1de569055432fb018ed Mon Sep 17 00:00:00 2001
+From: Francisco Facioni <fran6co@gmail.com>
+Date: Mon, 5 Jan 2015 15:38:57 -0300
+Subject: [PATCH] Fix for boost 1.57
+
+---
+ apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp | 2 +-
+ common/include/pcl/common/boost.h                          | 4 ++--
+ common/include/pcl/conversions.h                           | 2 ++
+ common/include/pcl/for_each_type.h                         | 2 ++
+ common/include/pcl/register_point_struct.h                 | 4 ++--
+ tools/boost.h                                              | 4 ++--
+ visualization/include/pcl/visualization/interactor_style.h | 3 ++-
+ visualization/tools/image_viewer.cpp                       | 2 +-
+ 8 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp b/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
+index b457862..2a3fe5b 100644
+--- a/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
++++ b/apps/include/pcl/apps/impl/dominant_plane_segmentation.hpp
+@@ -33,9 +33,9 @@
+  *
+  */
+ 
++#ifndef Q_MOC_RUN
+ #pragma once
+ #include <boost/thread/thread.hpp>
+-#ifndef Q_MOC_RUN
+ #include <boost/date_time/posix_time/posix_time.hpp>
+ #endif
+ 
+diff --git a/common/include/pcl/common/boost.h b/common/include/pcl/common/boost.h
+index b70f098..acc70af 100644
+--- a/common/include/pcl/common/boost.h
++++ b/common/include/pcl/common/boost.h
+@@ -43,14 +43,13 @@
+ #pragma GCC system_header 
+ #endif
+ 
++#ifndef Q_MOC_RUN
+ // Marking all Boost headers as system headers to remove warnings
+ #include <boost/fusion/sequence/intrinsic/at_key.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/make_shared.hpp>
+ #include <boost/mpl/size.hpp>
+-#ifndef Q_MOC_RUN
+ #include <boost/date_time/posix_time/posix_time.hpp>
+-#endif
+ #include <boost/function.hpp>
+ //#include <boost/timer.hpp>
+ #include <boost/thread.hpp>
+@@ -58,5 +57,6 @@
+ #include <boost/signals2.hpp>
+ #include <boost/signals2/slot.hpp>
+ #include <boost/algorithm/string.hpp>
++#endif
+ 
+ #endif    // PCL_COMMON_BOOST_H_
+diff --git a/common/include/pcl/conversions.h b/common/include/pcl/conversions.h
+index 13b883d..a5bf20b 100644
+--- a/common/include/pcl/conversions.h
++++ b/common/include/pcl/conversions.h
+@@ -52,7 +52,9 @@
+ #include <pcl/for_each_type.h>
+ #include <pcl/exceptions.h>
+ #include <pcl/console/print.h>
++#ifndef Q_MOC_RUN
+ #include <boost/foreach.hpp>
++#endif
+ 
+ namespace pcl
+ {
+diff --git a/common/include/pcl/for_each_type.h b/common/include/pcl/for_each_type.h
+index 4d05e04..d6973d4 100644
+--- a/common/include/pcl/for_each_type.h
++++ b/common/include/pcl/for_each_type.h
+@@ -44,6 +44,7 @@
+ #pragma GCC system_header 
+ #endif
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/mpl/is_sequence.hpp>
+ #include <boost/mpl/begin_end.hpp>
+ #include <boost/mpl/next_prior.hpp>
+@@ -54,6 +55,7 @@
+ #include <boost/mpl/not.hpp>
+ #include <boost/mpl/aux_/unwrap.hpp>
+ #include <boost/type_traits/is_same.hpp>
++#endif
+ 
+ namespace pcl 
+ {
+diff --git a/common/include/pcl/register_point_struct.h b/common/include/pcl/register_point_struct.h
+index 88a8135..57a0e42 100644
+--- a/common/include/pcl/register_point_struct.h
++++ b/common/include/pcl/register_point_struct.h
+@@ -51,6 +51,8 @@
+   #pragma warning (disable: 4244)
+ #endif
+ 
++//https://bugreports.qt-project.org/browse/QTBUG-22829
++#ifndef Q_MOC_RUN
+ #include <pcl/pcl_macros.h>
+ #include <pcl/point_traits.h>
+ #include <boost/mpl/vector.hpp>
+@@ -60,8 +62,6 @@
+ #include <boost/preprocessor/cat.hpp>
+ #include <boost/preprocessor/comparison.hpp>
+ #include <boost/utility.hpp>
+-//https://bugreports.qt-project.org/browse/QTBUG-22829
+-#ifndef Q_MOC_RUN
+ #include <boost/type_traits.hpp>
+ #endif
+ #include <stddef.h> //offsetof
+diff --git a/tools/boost.h b/tools/boost.h
+index d9a3675..f1b44dc 100644
+--- a/tools/boost.h
++++ b/tools/boost.h
+@@ -45,6 +45,7 @@
+ #pragma GCC system_header 
+ #endif
+ 
++#ifndef Q_MOC_RUN
+ // Marking all Boost headers as system headers to remove warnings
+ #include <boost/random.hpp>
+ #include <boost/random/normal_distribution.hpp>
+@@ -52,12 +53,11 @@
+ #include <boost/lexical_cast.hpp>
+ #include <boost/make_shared.hpp>
+ #include <boost/date_time/gregorian/gregorian_types.hpp>
+-#ifndef Q_MOC_RUN
+ #include <boost/date_time/posix_time/posix_time.hpp>
+-#endif
+ #include <boost/date_time/posix_time/posix_time_types.hpp>
+ #include <boost/thread/thread.hpp>
+ //#include <boost/uuid/uuid.hpp>
+ //#include <boost/uuid/uuid_generators.hpp>
++#endif
+ 
+ #endif    // PCL_TOOLS_BOOST_H_
+diff --git a/visualization/include/pcl/visualization/interactor_style.h b/visualization/include/pcl/visualization/interactor_style.h
+index fa9bebb..c89bb2d 100644
+--- a/visualization/include/pcl/visualization/interactor_style.h
++++ b/visualization/include/pcl/visualization/interactor_style.h
+@@ -47,8 +47,9 @@
+ #include <pcl/visualization/mouse_event.h>
+ #include <pcl/visualization/point_picking_event.h>
+ #include <pcl/visualization/area_picking_event.h>
++#ifndef Q_MOC_RUN
+ #include <boost/signals2/signal.hpp>
+-
++#endif
+ #include <vtkInteractorStyleRubberBandPick.h>
+ 
+ class vtkRendererCollection;
+diff --git a/visualization/tools/image_viewer.cpp b/visualization/tools/image_viewer.cpp
+index db4f48d..03f35dd 100644
+--- a/visualization/tools/image_viewer.cpp
++++ b/visualization/tools/image_viewer.cpp
+@@ -36,8 +36,8 @@
+  *	
+  */
+ 
+-#include <boost/thread/thread.hpp>
+ #ifndef Q_MOC_RUN
++#include <boost/thread/thread.hpp>
+ #include <boost/date_time/posix_time/posix_time.hpp>
+ #endif
+ #include <pcl/point_cloud.h>
+-- 
+2.5.0
+
diff --git a/debian/patches/0008-Fixes-manual_registration-and-segmentation-demo-for-.patch b/debian/patches/0008-Fixes-manual_registration-and-segmentation-demo-for-.patch
new file mode 100644
index 00000000..3716136c
--- /dev/null
+++ b/debian/patches/0008-Fixes-manual_registration-and-segmentation-demo-for-.patch
@@ -0,0 +1,65 @@
+From f5227353551bb8cd96ba320b934c66c42c07be6f Mon Sep 17 00:00:00 2001
+From: Francisco Facioni <fran6co@gmail.com>
+Date: Mon, 5 Jan 2015 15:38:57 -0300
+Subject: [PATCH] Fixes manual_registration and segmentation demo for boost
+ 1.57
+
+---
+ apps/include/pcl/apps/manual_registration.h   | 2 ++
+ common/include/pcl/common/time_trigger.h      | 2 ++
+ segmentation/include/pcl/segmentation/boost.h | 3 ++-
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/apps/include/pcl/apps/manual_registration.h b/apps/include/pcl/apps/manual_registration.h
+index 8193428..99454c1 100644
+--- a/apps/include/pcl/apps/manual_registration.h
++++ b/apps/include/pcl/apps/manual_registration.h
+@@ -42,7 +42,9 @@
+ #include <QTimer>
+ 
+ // Boost
++#ifndef Q_MOC_RUN
+ #include <boost/thread/thread.hpp>
++#endif
+ 
+ // PCL
+ #include <pcl/console/print.h>
+diff --git a/common/include/pcl/common/time_trigger.h b/common/include/pcl/common/time_trigger.h
+index 697d3af..941f96b 100644
+--- a/common/include/pcl/common/time_trigger.h
++++ b/common/include/pcl/common/time_trigger.h
+@@ -40,9 +40,11 @@
+ #define PCL_COMMON_TIME_TRIGGER_H_
+ 
+ #include <pcl/pcl_macros.h>
++#ifndef Q_MOC_RUN
+ #include <boost/function.hpp>
+ #include <boost/thread.hpp>
+ #include <boost/signals2.hpp>
++#endif
+ 
+ namespace pcl
+ {
+diff --git a/segmentation/include/pcl/segmentation/boost.h b/segmentation/include/pcl/segmentation/boost.h
+index 32135b9..f2baa9f 100644
+--- a/segmentation/include/pcl/segmentation/boost.h
++++ b/segmentation/include/pcl/segmentation/boost.h
+@@ -45,6 +45,7 @@
+ #pragma GCC system_header 
+ #endif
+ 
++#ifndef Q_MOC_RUN
+ // Marking all Boost headers as system headers to remove warnings
+ #include <boost/version.hpp>
+ #include <boost/make_shared.hpp>
+@@ -55,6 +56,6 @@
+ #if (BOOST_VERSION >= 104400) 
+   #include <boost/graph/boykov_kolmogorov_max_flow.hpp>
+ #endif 
+-
++#endif
+ 
+ #endif    // PCL_SEGMENTATION_BOOST_H_
+-- 
+2.5.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 02758a0f..dcfa7f97 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,6 @@
 0003-Always-build-libpcl_apps.so.patch
 0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch
 0005-tools-depends-on-visualization.patch
+0006-fixes-for-boost-1.56-and-Qt4.patch
+0007-Fix-for-boost-1.57.patch
+0008-Fixes-manual_registration-and-segmentation-demo-for-.patch